One more variable coming up nil on the first time around, needing

guarding.

diff --git a/lisp/calendar/timeclock.el b/lisp/calendar/timeclock.el
index a054513441cf133d69146970249106e0b0c0a83e..e570f9bf2f77a4285ae946e2e4598c56aeb7a27f 100644 (file)
--- a/lisp/calendar/timeclock.el
+++ b/lisp/calendar/timeclock.el
@@ -1080,7 +1080,7 @@ See the documentation for the given function if more info is needed."
     (unless timeclock-last-event-workday
       (setq timeclock-last-event-workday timeclock-workday))
     (setq accum timeclock-discrepancy
-         elapsed timeclock-elapsed)
+         elapsed (or timeclock-elapsed elapsed))
     (if timeclock-last-event
        (if (equal (car timeclock-last-event) "i")
            (let ((last-period (timeclock-last-period now)))